Final Version 3

*Issues weren't really fixed... workin on it