Beta Version 1

All working, needs some details reviewed