Finished with most of the work. Testing and ATAT + AWT is left