Commit 2

Still test + functions