update

starting to shape up but still has issues to resolve...